merge from trunk
authorKenichi Handa <handa@m17n.org>
Tue, 5 Jan 2010 11:42:19 +0000 (20:42 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 5 Jan 2010 11:42:19 +0000 (20:42 +0900)
commit57c78f24218cf5ca4bb949c33ed444f4f4d1f100
treea0005a5743cdef5660af6afb246c1c7714eb1e1d
parent7d7112918354fe563ef7ae48fb7e8c2c991b29c1
parent578ce472187e076751f7a7d766e5c2d4ba010a0d
merge from trunk